Sync with upstream for MC 1.20.1#239
Merged
Su5eD merged 10 commits intoSinytra:1.20.1from Aug 14, 2025
Merged
Conversation
* Don't track fake player network addons * Review feedback Co-authored-by: modmuss <modmuss50@gmail.com>
(cherry picked from commit e82f21f7e92545027a4dec8081c1bcac860a8259) Co-authored-by: apple502j <33279053+apple502j@users.noreply.github.com>
* Fix TypeAwareBuyForOneEmeraldFactory trade offer crash (#4457) * Fix TypeAwareBuyForOneEmeraldFactory trade offer crash Fixes #4456 * Fix extra separation style issue * Fix style issues in EmptyTypeAwareBuyForOneEmeraldTradeOfferGameTest * Rename for clarity in TypeAwareBuyForOneEmeraldFactory mixin * Further clarify TypeAwareBuyForOneEmeraldFactory mixin docs (cherry picked from commit 38b0d598dabd4f54a67f919484b235a7f1e6efeb) * Update Fabric Loader * Update actions/upload-artifact * Fix? --------- Co-authored-by: Zoe <104020300+antikyth@users.noreply.github.com>
All modules bumped due to higher loader requirement.
(cherry picked from commit 9c49cc8ce12d0046cbf7051cf6debacff0511616) (cherry picked from commit aa6d566c45cba70a0a7128e4dbdbf5cd8ac5c3ad) Co-authored-by: PepperCode1 <44146161+PepperCode1@users.noreply.github.com>
* backport fakeplayer memory leak fix to 1.20.1 * fix checkstyle violations * Less risky change --------- Co-authored-by: modmuss50 <modmuss50@gmail.com>
SNWCreations
force-pushed
the
sync/1.20.1
branch
from
4366f5f to
6980020
Compare
Su5eD
approved these changes
Aug 14, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The Issue
The current version of Forgified Fabric API for MC 1.20.1 lacks some upstream changes, so I ported them there.
I know this might be a duplicate of #220 but that is stale, isn't it?
This PR implements the latest upstream changes (from
13a40c66to761f669din upstream repo, ends at Fabric API 0.92.6) and update the project to use Forge 47.4.6, Fabric Loader 0.16.10, MixinExtras 0.5.1 for Forge.The PR has been tested in an enviroment with some Forge mods and Replay Mod (ver 2.6.15) on Forge 47.4.6 with Connector installed, they worked well.
The Proposal
Sync with upstream changes, fixes the bugs that were fixed by upstream commits.
Possible Side Effects
Fix bugs that were fixed by upstream.
Alternatives
None. It is impossible to ignore known issues that have been fixed with a working solution.
Additional Notes
None.